bitkeeper revision 1.1159.258.168 (42b351653L3XVvz6UCiRgtfHHvj-Eg)

Subject: [Xen-devel] [PATCH] _perform_err

the declaration of _perform_err needs at least three arguments
(exlcuding self), but gets onky called with two args at many
places. This messes up xend-debug.log.
Patch is against 2.0-testing, but applied cleanly to unstable
as well, when I checked last.

From: Kurt Garloff <kurt@garloff.de>
Signed-off-by: ian@xensource.com

diff --git a/tools/python/xen/xend/server/SrvBase.py b/tools/python/xen/xend/server/SrvBase.py
index 5990733d75405503190cee76942a3e59527b2dac..b32d10227316860e604f2adaf12fb3d4da216f75 100644 (file)
--- a/tools/python/xen/xend/server/SrvBase.py
+++ b/tools/python/xen/xend/server/SrvBase.py
@@ -106,8 +106,7 @@ class SrvBase(resource.Resource):
         try:
             val = op_method(op, req)
         except Exception, err:
-            self._perform_err(err, op, req)
-            return ''
+            return self._perform_err(err, op, req)
             
         if isinstance(val, defer.Deferred):
             val.addCallback(self._perform_cb, op, req, dfr=1)

diff --git a/tools/python/xen/xend/server/SrvConsole.py b/tools/python/xen/xend/server/SrvConsole.py
index 4105fa6e16777ec6e93473d943ff62e70477ccec..c8878ca419a25335d53e69b30d12fdcd64aa3f39 100644 (file)
--- a/tools/python/xen/xend/server/SrvConsole.py
+++ b/tools/python/xen/xend/server/SrvConsole.py
@@ -36,7 +36,7 @@ class SrvConsole(SrvDir):
                 req.write('</body></html>')
             return ''
         except Exception, ex:
-            self._perform_err(ex, req)
+            self._perform_err(ex, "console", req)
 
     def form(self, req):
         req.write('<form method="post" action="%s">' % req.prePathURL())

diff --git a/tools/python/xen/xend/server/SrvConsoleDir.py b/tools/python/xen/xend/server/SrvConsoleDir.py
index 139f3025368c0f5bbd987fde92c97a4ae468ff4b..140713c57d3c01946841b7192497adcee87cfa89 100644 (file)
--- a/tools/python/xen/xend/server/SrvConsoleDir.py
+++ b/tools/python/xen/xend/server/SrvConsoleDir.py
@@ -44,7 +44,7 @@ class SrvConsoleDir(SrvDir):
                 req.write("</body></html>")
             return ''
         except Exception, ex:
-            self._perform_err(ex, req)
+            self._perform_err(ex, "ls_console", req)
 
     def ls_console(self, req, use_sxp=0):
         url = req.prePathURL()

diff --git a/tools/python/xen/xend/server/SrvDir.py b/tools/python/xen/xend/server/SrvDir.py
index 712521c7b3e1f2af1c34dfecffff5b490603b438..6b36b1e4b68e43c4f56041ed43867b1994137200 100644 (file)
--- a/tools/python/xen/xend/server/SrvDir.py
+++ b/tools/python/xen/xend/server/SrvDir.py
@@ -88,7 +88,7 @@ class SrvDir(SrvBase):
                 req.write('</body></html>')
             return ''
         except Exception, ex:
-            self._perform_err(ex, "GET", req)
+            self._perform_err(ex, "ls", req)
             
     def ls(self, req, use_sxp=0):
         url = req.prePathURL()

diff --git a/tools/python/xen/xend/server/SrvDmesg.py b/tools/python/xen/xend/server/SrvDmesg.py
index 11fa4547c24a15fc1ee70d345079ce9d7f314e2b..f383b07d3b29907a4008b70e8ab0d3ab87b44f27 100644 (file)
--- a/tools/python/xen/xend/server/SrvDmesg.py
+++ b/tools/python/xen/xend/server/SrvDmesg.py
@@ -31,7 +31,7 @@ class SrvDmesg(SrvDir):
                 req.write('</pre></body></html>')
             return ''
         except Exception, ex:
-            self._perform_err(ex, req)
+            self._perform_err(ex, "dmesg", req)
             
     def info(self):
         return self.xd.info()

diff --git a/tools/python/xen/xend/server/SrvDomainDir.py b/tools/python/xen/xend/server/SrvDomainDir.py
index 2fc8ee487756b0c77bfe5f5410e78db997beda19..912b1af6747938894cc95a5c983b121988c20c6d 100644 (file)
--- a/tools/python/xen/xend/server/SrvDomainDir.py
+++ b/tools/python/xen/xend/server/SrvDomainDir.py
@@ -133,7 +133,7 @@ class SrvDomainDir(SrvDir):
                 req.write("</body></html>")
             return ''
         except Exception, ex:
-            self._perform_err(ex, req)
+            self._perform_err(ex, "ls_domain", req)
 
     def ls_domain(self, req, use_sxp=0):
         url = req.prePathURL()

diff --git a/tools/python/xen/xend/server/SrvNode.py b/tools/python/xen/xend/server/SrvNode.py
index c1b3ab560e9295a319be989ebadbfe3842c4e010..7776bbf846dc37f363493106af5c357497aff8fd 100644 (file)
--- a/tools/python/xen/xend/server/SrvNode.py
+++ b/tools/python/xen/xend/server/SrvNode.py
@@ -60,7 +60,7 @@ class SrvNode(SrvDir):
                 req.write('</body></html>')
             return ''
         except Exception, ex:
-            self._perform_err(ex, req)
+            self._perform_err(ex, "node info", req)
             
     def info(self):
         return self.xn.info()

diff --git a/tools/python/xen/xend/server/SrvVnetDir.py b/tools/python/xen/xend/server/SrvVnetDir.py
index 3577cb631fc8b5aad78164bbfb9bf904585bdff0..dc95c18c57100bb67e7e1ea0293c6b0dd087466a 100644 (file)
--- a/tools/python/xen/xend/server/SrvVnetDir.py
+++ b/tools/python/xen/xend/server/SrvVnetDir.py
@@ -88,7 +88,7 @@ class SrvVnetDir(SrvDir):
                 req.write("</body></html>")
             return ''
         except Exception, ex:
-            self._perform_err(ex, req)
+            self._perform_err(ex, "ls_vnet", req)
 
     def ls_vnet(self, req, use_sxp=0):
         url = req.prePathURL()

diff --git a/tools/python/xen/xend/server/SrvXendLog.py b/tools/python/xen/xend/server/SrvXendLog.py
index 0edb110572580e745590cc8e096c8f5be4e5106e..ad4c0c572b878aeba82d94c4465751216df48756 100644 (file)
--- a/tools/python/xen/xend/server/SrvXendLog.py
+++ b/tools/python/xen/xend/server/SrvXendLog.py
@@ -21,4 +21,4 @@ class SrvXendLog(SrvDir):
         try:
             return self.logfile.render(req)
         except Exception, ex:
-            self._perform_err(ex, req)
+            self._perform_err(ex, "log", req)